From: Michael Albinus <michael.albinus@gmx.de>
Date: Wed, 20 Jan 2016 10:03:36 +0000 (+0100)
Subject: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~21^2~3839
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=1d5f46b20e98a2fb9b67cb4708a7508b501e4057;p=emacs.git

Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
---

1d5f46b20e98a2fb9b67cb4708a7508b501e4057